Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Prevent Banished in Larva Queue and Set Queue Time for Cryoing #3885

Merged
merged 4 commits into from
Jul 18, 2023

Conversation

Drulikar
Copy link
Contributor

@Drulikar Drulikar commented Jul 14, 2023

About the pull request

This PR makes it so the larva queue can check if the candidate is currently in the banishment list for a hive. Join as xeno checks this, but xeno candidates (even before the queue) never has.

A note of banishment is added to the queue message if join as xeno is used to check queue placement, but otherwise they just simply won't have queue messages until some hive core they aren't banished from ticks. The reason why they personally have a number at all though is because that was a check for all possible xeno hives. If say both the normal hive and greeno hive cores were ticking, there were 10 ghosts total, and 2 were banished from the normal hive, the queue length for the greeno hive would have 10 people, and the queue length for the normal hive would have 8 people, but otherwise the queue is shared.

This PR also makes it so entering a cryopod sets your queue time; otherwise any marine that cryos (even if its say two hours in a game) would be basically the front of the queue (the time would still just be their join time).

Explain why it's good for the game

Banished players should stay banished until the queen changes her mind or dies. Cryo'd marines also shouldn't get prioritized over people who have been waiting.

Testing Photographs and Procedure

Screenshots & Videos

(Message below was also tweaked to also include "Your queue number won't update until there is a hive you aren't banished from.")
image

Changelog

🆑 Drathek
fix: Banished players will no longer be candidates for hives they are banished from.
fix: Cryoing will now set your larva queue time so you don't get prioritized over others that have been waiting.
admin: Shuttle intoTheSunset will set larva queue time the same as other situations.
/:cl:

@github-actions github-actions bot added Fix Fix one bug, make ten more Admin Make things harder for admins labels Jul 14, 2023
@harryob harryob added this pull request to the merge queue Jul 18, 2023
Merged via the queue into cmss13-devs:master with commit aa4988c Jul 18, 2023
cm13-github added a commit that referenced this pull request Jul 18, 2023
github-actions bot added a commit that referenced this pull request Jul 18, 2023
@Drulikar Drulikar deleted the Prevent_Banished_In_Queue branch July 18, 2023 19:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Admin Make things harder for admins Fix Fix one bug, make ten more
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants